From 95d6021ba4506c8c2006750a430755126d11cada Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 17 Jan 2009 13:06:48 +0000 Subject: [PATCH] Don't redeclare functions declared with the BABL_CLASS() or BABL_NAMED_CLASS() macros. * babl-component.h * babl-conversion.h * babl-extension.h * babl-fish.h * babl-format.h * babl-image.h * babl-model.h * babl-sampling.h * babl-type.h svn path=/trunk/; revision=369 --- ChangeLog | 15 +++++++++++++++ babl/babl-component.h | 6 ------ babl/babl-conversion.h | 6 ------ babl/babl-extension.h | 6 ------ babl/babl-fish.h | 4 ---- babl/babl-format.h | 6 ------ babl/babl-image.h | 4 +--- babl/babl-model.h | 6 ------ babl/babl-sampling.h | 3 --- babl/babl-type.h | 6 ------ 10 files changed, 16 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a28fe4..0b71f24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2009-01-17 Martin Nordholts + + Don't redeclare functions declared with the BABL_CLASS() or + BABL_NAMED_CLASS() macros. + + * babl-component.h + * babl-conversion.h + * babl-extension.h + * babl-fish.h + * babl-format.h + * babl-image.h + * babl-model.h + * babl-sampling.h + * babl-type.h + 2009-01-17 Martin Nordholts * babl/babl-main.h: New installed file with babl_init() and diff --git a/babl/babl-component.h b/babl/babl-component.h index fa8090b..6cfae07 100644 --- a/babl/babl-component.h +++ b/babl/babl-component.h @@ -28,12 +28,6 @@ BABL_NAMED_CLASS (component); * Babl * babl_component_new (const char *name, * NULL); */ -Babl *babl_component_id (int id); -void babl_component_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_component (const char *name); -Babl * babl_component_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; typedef struct { diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h index 4f697b1..d5d609f 100644 --- a/babl/babl-conversion.h +++ b/babl/babl-conversion.h @@ -30,12 +30,6 @@ BABL_NAMED_CLASS (conversion); * <"linear"|"planar">, BablConversionFunc conv_func, * NULL); */ -Babl *babl_conversion_id (int id); -void babl_conversion_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_conversion (const char *name); -Babl * babl_conversion_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; /* Type and Format */ typedef long (*BablFuncLinear) (char *src, diff --git a/babl/babl-extension.h b/babl/babl-extension.h index 152ab7f..723198b 100644 --- a/babl/babl-extension.h +++ b/babl/babl-extension.h @@ -26,12 +26,6 @@ BABL_NAMED_CLASS (extension); /* * BablExtension objects are only used internally in babl. */ -Babl *babl_extension_id (int id); -void babl_extension_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_extension (const char *name); -Babl * babl_extension_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; typedef struct { diff --git a/babl/babl-fish.h b/babl/babl-fish.h index 56b7ab5..938d43b 100644 --- a/babl/babl-fish.h +++ b/babl/babl-fish.h @@ -38,10 +38,6 @@ long babl_process (Babl *babl_fish, void *destination, long n); -Babl *babl_fish_id (int id); -void babl_fish_each (BablEachFunction each_fun, - void *user_data); - /* BablFish, common base class for various fishes. */ typedef struct diff --git a/babl/babl-format.h b/babl/babl-format.h index 4903e24..d8cb04d 100644 --- a/babl/babl-format.h +++ b/babl/babl-format.h @@ -40,12 +40,6 @@ BABL_NAMED_CLASS (format); * components as well. If no name is provided a (long) descriptive * name is used. */ -Babl *babl_format_id (int id); -void babl_format_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_format (const char *name); -Babl * babl_format_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; typedef struct { diff --git a/babl/babl-image.h b/babl/babl-image.h index 353144e..8d4fc6e 100644 --- a/babl/babl-image.h +++ b/babl/babl-image.h @@ -43,9 +43,7 @@ BABL_CLASS (image); */ Babl * babl_image (void *first_component, ...) BABL_ARG_NULL_TERMINATED; -Babl *babl_image_id (int id); -void babl_image_each (BablEachFunction each_fun, - void *user_data); + typedef struct { BablInstance instance; diff --git a/babl/babl-model.h b/babl/babl-model.h index 8307d0e..ec2dd65 100644 --- a/babl/babl-model.h +++ b/babl/babl-model.h @@ -33,12 +33,6 @@ BABL_NAMED_CLASS (model); * name of all the involved components. * */ -Babl *babl_model_id (int id); -void babl_model_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_model (const char *name); -Babl * babl_model_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; typedef struct { diff --git a/babl/babl-sampling.h b/babl/babl-sampling.h index 6aeee0b..0e772d1 100644 --- a/babl/babl-sampling.h +++ b/babl/babl-sampling.h @@ -26,9 +26,6 @@ BABL_CLASS (sampling); /**/ Babl * babl_sampling (int horizontal, int vertical); -Babl *babl_sampling_id (int id); -void babl_sampling_each (BablEachFunction each_fun, - void *user_data); typedef struct { BablInstance instance; diff --git a/babl/babl-type.h b/babl/babl-type.h index ee51eb7..dd4857f 100644 --- a/babl/babl-type.h +++ b/babl/babl-type.h @@ -34,12 +34,6 @@ BABL_NAMED_CLASS (type); * ["max_val", double max_val,] * NULL); */ -Babl *babl_type_id (int id); -void babl_type_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_type (const char *name); -Babl * babl_type_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; typedef struct { -- 2.30.2